forked from qmk/qmk_firmware
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge from upstream #2
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This wasn't going to work on boards with a different number of LEDs, since I was always sending 48 bytes.
This adds basic support for JM60 RGB PCB that was sold by KBDfans https://kbdfans.myshopify.com/ https://www.aliexpress.com/store/product/JM60-RGB60-Custom-mechanical-keyboard-PCB-ANSI/2230037_32810956675.html No support for RGB Backlight yet.
Don`t know, if this is 100% correct, but the original software refers to "JMWS JM60 Driver".
* implement basic terminal stuff * modify send_string to read normal strings too * add files bc yeah. working pgm detected * pgm detection apparently not working * adds send string keycodes, additional keycode support in send string * implement arguments * [terminal] add help command * [terminal] adds keycode and keymap functions * [terminal] adds nop.h, documentation * update macro docs
* Sean Hunter initial keymap * Update old map to sync it up with new one * Add TODO fix a few minor things * small doc fixes * Minor fixups
* Port TMK code for MF68 * Change KEYMAP to KC_KEYMAP and add macro
* updated read.md file * added image to flash hex on ergodone * corrected image link * updated direct image link * image with larger text
…ap (#1715) * Add HOME/END keys as upper/lower on arrow-up/down * Reduce .hex file size by turning off unneeded options * Put digit keypad onto left hand upon RAISE; this will sometimes be preferable to double-hits of right hand * Latest super latest version merge * cbbrowne keymap for XD75re * starting notes on XD75re keymap plans * First draft of bottom row of QWERTY * Switch my special bottom line over to QCENT * Dunno * Filling in wanted keys, bit by bit... * Add copyright, extra macro * Clean up comments, remove some experimental code I didn't like * TODO plans for xd75re * clean up keyboard layout * QCENT2 is my new experiment for the main keyboard... * Add a few more main layer keys, and modify LOWER to shift things outwards to conform with main layer * Clean up RAISE layer to conform with main layer, remove QCENT layer as QCENT2 is the new thing * More xd75 changes, now that I actually have it in hand * shift keymap around, as original attempt was a bit too aggressive in keeping to the edges * more revs to XD75 * Dropping parts of the centre keypad in favor of Keys I Really Need * Improve documentation to conform with how builds are done now * Improve documentation to conform with how builds are done now * Add cbbrowne rules file as alternative to having the rules in Makefile * Makefile not needed anymore for individual keymap
* Merge with upstream * Finish merge * Add new keymap * Change use of KEYMAP macro * Add Readme.md * Fix link * Clean up comments * Raise on leading edge of keypress
* Fork lets_split to levinson Update subproject default * Update Readme * Pass LED backlight info from master to slave over serial
…lts (#1712) * add new RGB keycodes and clean up lets split keymap * extraneous cases * More cleanup and added macro * one more macro * cleaned up my planck keymap and added macros * Transitioned planck keymap to new formatting / audio modes based on new default * Remove extraneous newline in song list, add keycodes missed in previous commit * error in graphical representation of keycodes
…era Adapter compatibility
* importing 42 key dvorak layout * added comment for build instructions * adding atreus dvorak 42 key layout * added readme * add readme * build instructions * additional MEH shortcuts
* all of my updates * return to base config for xd60.c * remove janky keymap header definition * update readme for xd60 * update Planck readme
* Add first version of my layout * Tweaked layout * gh60/bluezio: SpaceFn CapsLock interferes with Ctrl+Arrows
* Added Dichotemy Keyboard, updated docs for Pointing Device * Updated readme * Updated mouse report pointer in pointing_device.c
* Add files via upload * Add files via upload * Add files via upload * Add files via upload * Update keymap.c * Update keymap.c * Update keymap.c * Update keymap.c
This was too easy to press by accident (next to Alt). Make this user configurable.
neue Datei: keyboards/lets_split/keymaps/DE_simple/config.h neue Datei: keyboards/lets_split/keymaps/DE_simple/keymap.c neue Datei: keyboards/lets_split/keymaps/DE_simple/rules.mk
* Add woodpad * Cleanup * Remove misc layouts for woodpad * Move woodpad to handwired * Updated RGB Underglow info * Cleanup macros * Fix odd merge issue * Tweaked RGB lighting stuff * Start to merge orthodox/ergodox keymaps (persistant layers) * Add forced NKRO * Added Colemak and Dvorak layers to default orthodox keymap * Added default layer (qwerty/colemak/dvorak) detection to RGB Underglow
… important information. Updated links to moved content.
* add stock layout for xd75 * fix layout bug * layout naming * don't need it * Cleaning up
VadimBrodsky
pushed a commit
that referenced
this pull request
Nov 6, 2018
* first verion of skug * zudvp layer added and new thumb cluster * move del to arrw cluster and switch places of algr and no_circ * first verion of skug * zudvp layer added and new thumb cluster * move del to arrw cluster and switch places of algr and no_circ * rework layouts * Adds SYMB layer toggle to 'ä' Closes #2 Also moves ctrl away from '-' and 'z' to the outer bottom corners and removes redundant SYMB layer binds from there * Adds mouse movement to right hand on ARRW layer Closes #3 * Fix typoed keycodes * planck qwerty nordic * Update README.md * Update README.md * Implemented changes to planck layout requested by drashna * Implemented changes to ergodox layout requested by drashna NOTE: `version.h` is still required.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.